(Setting minor-mode-map-alist):

Put the map directly in the alist, not a variable name.

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 1fd7bfdd54f2e33a410eee2c203b5108cbb269cc..7bca70da1d863e67bd0984c80bfc77ed3c33b757 100644 (file)
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -31,7 +31,7 @@
 
 ;;;###autoload
 (defvar compilation-mode-hook nil
-  "*List of hook functions run by compilation-mode (see `run-hooks').")
+  "*List of hook functions run by `compilation-mode' (see `run-hooks').")
 
 ;;;###autoload
 (defconst compilation-window-height nil
@@ -336,7 +336,7 @@ Returns the compilation buffer created."
     (define-key map "\M-{" 'compilation-previous-file)
     (define-key map "\M-}" 'compilation-next-file)
     map)
-  "Keymap for compilation-minor-mode.")
+  "Keymap for `compilation-minor-mode'.")
 
 (defvar compilation-mode-map
   (let ((map (cons 'keymap compilation-minor-mode-map)))
@@ -344,7 +344,7 @@ Returns the compilation buffer created."
     (define-key map "\^?" 'scroll-down)
     map)
   "Keymap for compilation log buffers.
-compilation-minor-mode-map is a cdr of this.")
+`compilation-minor-mode-map' is a cdr of this.")
 
 (defun compilation-mode ()
   "Major mode for compilation log buffers.
@@ -380,8 +380,8 @@ Compilation major mode are available.")
     (setq minor-mode-alist (cons '(compilation-minor-mode " Compilation")
                                 minor-mode-alist)))
 (or (assq 'compilation-minor-mode minor-mode-map-alist)
-    (setq minor-mode-map-alist (cons '(compilation-minor-mode
-                                      . compilation-minor-mode-map)
+    (setq minor-mode-map-alist (cons (cons 'compilation-minor-mode
+                                          compilation-minor-mode-map)
                                     minor-mode-map-alist)))
 
 (defun compilation-minor-mode (&optional arg)
@@ -441,7 +441,7 @@ See `compilation-mode'."
 
 (defun compilation-filter (proc string)
   "Process filter for compilation buffers.
-Just inserts the text, but uses insert-before-markers."
+Just inserts the text, but uses `insert-before-markers'."
   (save-excursion
     (set-buffer (process-buffer proc))
     (let ((buffer-read-only nil))

diff --git a/lisp/vc.el b/lisp/vc.el
index 3e0f41f7005222ca2da307993c410152f186925b..6073ebe86df27bbd2e9ddfd09c032fc966e6614b 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -830,7 +830,7 @@ the variable `vc-header-alist'."
 (or (not (boundp 'minor-mode-map-alist))
     (assq 'vc-dired-mode minor-mode-map-alist)
     (setq minor-mode-map-alist
-          (cons '(vc-dired-mode . vc-dired-prefix-map)
+          (cons (cons 'vc-dired-mode vc-dired-prefix-map)
                 minor-mode-map-alist)))
 
 (defun vc-dired-mode ()